From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 21 Jun 2010 17:37:34 +0000 (+0100)
Subject: Revert 21641:2e5844e17d6f "xencommons: modprobe xenfs if it not be loaded"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11897
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=c814a49b0654193f409fa4dd013805b373302d83;p=xen.git

Revert 21641:2e5844e17d6f "xencommons: modprobe xenfs if it not be loaded"

Nacked by Jeremy Fitzhardinge and Ian Jackson.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons
index 6885cb924c..d8680fba02 100644
--- a/tools/hotplug/Linux/init.d/xencommons
+++ b/tools/hotplug/Linux/init.d/xencommons
@@ -24,21 +24,16 @@ test -f /etc/sysconfig/xencommons && . /etc/sysconfig/xencommons
 XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
 shopt -s extglob
 
-if test "x$1" = xstart; then
-	if ! grep '	xenfs$' /proc/filesystems >/dev/null; then
-		test -x /sbin/modprobe && /sbin/modprobe xenfs 2>/dev/null
-	fi
-	if test -d /proc/xen && \
-	    ! test -d /proc/xen/capabilities && \
-	      grep '	xenfs$' /proc/filesystems >/dev/null && \
-	    ! grep '^xenfs ' /proc/mounts >/dev/null;
-	then
-		mount -t xenfs xenfs /proc/xen
-	fi
+if test "x$1" = xstart && \
+     test -d /proc/xen && \
+   ! test -d /proc/xen/capabilities && \
+     grep '	xenfs$' /proc/filesystems >/dev/null && \
+   ! grep '^xenfs ' /proc/mounts >/dev/null;
+then
+	mount -t xenfs xenfs /proc/xen
 fi
 
-if ! test -e /proc/xen/capabilities || \
-    ! grep -q "control_d" /proc/xen/capabilities ; then
+if ! grep -q "control_d" /proc/xen/capabilities ; then
 	exit 0
 fi